fiptool: Precursor changes for Visual Studio

In order to compile the source of Fiptool using Visual Studio a number
of adjustments are required to the source.  This commit modifies the
source with changes that will be required, but makes no functional
modification.  The intent is to allow confirmation that the GCC build
is unaffected.

Change-Id: I4055bd941c646dd0a1aa2e24b940a1db3bf629ce
Signed-off-by: Evan Lloyd <[email protected]>

diff --git a/tools/fiptool/fiptool.c b/tools/fiptool/fiptool.c
index 02223d991b4d023d7de37a3da3f33cbaec3d2032..1dcb7e8e616ffad2d8f09646c6e212bf2b63cca0 100644 (file)
--- a/tools/fiptool/fiptool.c
+++ b/tools/fiptool/fiptool.c
@@ -9,18 +9,12 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <getopt.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-
-#include <openssl/sha.h>
-
-#include <firmware_image_package.h>
 
 #include "fiptool.h"
 #include "tbbr_config.h"
@@ -161,7 +155,7 @@ static void set_image_desc_action(image_desc_t *desc, int action,
 {
        assert(desc != NULL);
 
-       if (desc->action_arg != DO_UNSPEC)
+       if (desc->action_arg != (char *)DO_UNSPEC)
                free(desc->action_arg);
        desc->action = action;
        desc->action_arg = NULL;
@@ -278,7 +272,7 @@ static void uuid_from_str(uuid_t *u, const char *s)
 
 static int parse_fip(const char *filename, fip_toc_header_t *toc_header_out)
 {
-       struct stat st;
+       struct BLD_PLAT_STAT st;
        FILE *fp;
        char *buf, *bufend;
        fip_toc_header_t *toc_header;
@@ -370,11 +364,12 @@ static int parse_fip(const char *filename, fip_toc_header_t *toc_header_out)
 
 static image_t *read_image_from_file(const uuid_t *uuid, const char *filename)
 {
-       struct stat st;
+       struct BLD_PLAT_STAT st;
        image_t *image;
        FILE *fp;
 
        assert(uuid != NULL);
+       assert(filename != NULL);
 
        fp = fopen(filename, "rb");
        if (fp == NULL)
@@ -469,6 +464,7 @@ static int info_cmd(int argc, char *argv[])
                       (unsigned long long)image->toc_e.offset_address,
                       (unsigned long long)image->toc_e.size,
                       desc->cmdline_name);
+#ifndef _MSC_VER       /* We don't have SHA256 for Visual Studio. */
                if (verbose) {
                        unsigned char md[SHA256_DIGEST_LENGTH];
 
@@ -476,6 +472,7 @@ static int info_cmd(int argc, char *argv[])
                        printf(", sha256=");
                        md_print(md, sizeof(md));
                }
+#endif
                putchar('\n');
        }
 

diff --git a/tools/fiptool/fiptool.h b/tools/fiptool/fiptool.h
index 4b5cdd91f22ab523385bc576722217869da55a9f..d8a5d2cae09a0f77145ea3e2b6b249a470a54af1 100644 (file)
--- a/tools/fiptool/fiptool.h
+++ b/tools/fiptool/fiptool.h
@@ -13,6 +13,8 @@
 #include <firmware_image_package.h>
 #include <uuid.h>
 
+#include "fiptool_platform.h"
+
 #define NELEM(x) (sizeof (x) / sizeof *(x))
 
 enum {

diff --git a/tools/fiptool/fiptool_platform.h b/tools/fiptool/fiptool_platform.h
new file mode 100644 (file)
index 0000000..bfdd1ef
--- /dev/null
+++ b/tools/fiptool/fiptool_platform.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Build platform specific handling.
+ * This allows for builds on non-Posix platforms
+ * e.g. Visual Studio on Windows
+ */
+
+#ifndef __FIPTOOL_PLATFORM_H__
+#      define __FIPTOOL_PLATFORM_H__
+
+#      ifndef _MSC_VER
+
+               /* Not Visual Studio, so include Posix Headers. */
+#              include <getopt.h>
+#              include <openssl/sha.h>
+#              include <unistd.h>
+
+#              define  BLD_PLAT_STAT stat
+
+#      else
+
+               /* Visual Studio. */
+
+#      endif
+
+#endif /* __FIPTOOL_PLATFORM_H__ */